lib/controllers/pair_chat_controller.dart (1)

241-260: Excellent fix for the race condition!

The try/catch/finally structure with null-guarded deletion properly addresses the bug described in issue #670. The finally block ensures navigation always occurs, preventing the stuck UI, and the null check prevents the crash when cancel is tapped before the document is created.

Optional: Move requestDocId = null to the finally block for guaranteed cleanup.

Currently, if document deletion fails (lines 244-248), the exception is caught but requestDocId remains non-null until navigation completes. While Get.offNamedUntil should dispose the controller, moving the reset to finally would be more defensive:

🔎 View suggested refactor

 Future<void> cancelRequest() async {
   try {
     if (requestDocId != null) {
       await databases.deleteDocument(
         databaseId: masterDatabaseId,
         collectionId: pairRequestCollectionId,
         documentId: requestDocId!,
       );
     }
-
-    requestDocId = null;
-
     await subscription?.close();
     await userAddedSubscription?.close();
   } catch (e) {
     log('Cancel request failed: $e');
   } finally {
+    requestDocId = null;
     Get.offNamedUntil(AppRoutes.tabview, (route) => false);
   }
 }

Optional: Consider independent error handling for subscriptions.

If subscription?.close() throws on line 253, userAddedSubscription?.close() won't execute. Wrapping each in separate try/catch would ensure both closures are attempted:

🔎 View alternative approach

Future<void> cancelRequest() async {
  try {
    if (requestDocId != null) {
      await databases.deleteDocument(
        databaseId: masterDatabaseId,
        collectionId: pairRequestCollectionId,
        documentId: requestDocId!,
      );
    }
  } catch (e) {
    log('Failed to delete request document: $e');
  }

  try {
    await subscription?.close();
  } catch (e) {
    log('Failed to close subscription: $e');
  }

  try {
    await userAddedSubscription?.close();
  } catch (e) {
    log('Failed to close userAddedSubscription: $e');
  }

  requestDocId = null;
  Get.offNamedUntil(AppRoutes.tabview, (route) => false);
}

This provides more granular error reporting and guarantees all cleanup attempts execute.

Configuration used: defaults

Review profile: CHILL

Plan: Pro